* termhooks.h (struct terminal): Likewise.

diff --git a/src/ChangeLog b/src/ChangeLog
index e8153712a2f96b6517f0fa47de2d723fba9c8668..fe5eaf0c3286eb13b5e9460ba9f757b9861b6693 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -5,6 +5,7 @@
 
        * dispextern.h (struct redisplay_interface): Rename param
        to avoid shadowing.
+       * termhooks.h (struct terminal): Likewise.
 
        * insdel.c (make_gap_smaller): Define only if
        USE_MMAP_FOR_BUFFERS || REL_ALLOC || DOUG_LEA_MALLOC.

diff --git a/src/termhooks.h b/src/termhooks.h
index 2f509009bd9ef0745129e212af2dfd4de28a9f06..468381b69aac22bb358a2bd2ebc9e4b66e8ee3b1 100644 (file)
--- a/src/termhooks.h
+++ b/src/termhooks.h
@@ -465,7 +465,7 @@ struct terminal
                                enum scroll_bar_part *part,
                                Lisp_Object *x,
                                Lisp_Object *y,
-                               unsigned long *time);
+                               unsigned long *);
 
   /* The window system handling code should set this if the mouse has
      moved since the last call to the mouse_position_hook.  Calling that
@@ -484,10 +484,10 @@ struct terminal
      support overlapping frames, so there's no need to raise or lower
      anything.
 
-     If RAISE is non-zero, F is brought to the front, before all other
-     windows.  If RAISE is zero, F is sent to the back, behind all other
+     If RAISE_FLAG is non-zero, F is brought to the front, before all other
+     windows.  If RAISE_FLAG is zero, F is sent to the back, behind all other
      windows.  */
-  void (*frame_raise_lower_hook) (struct frame *f, int raise);
+  void (*frame_raise_lower_hook) (struct frame *f, int raise_flag);
 
   /* If the value of the frame parameter changed, whis hook is called.
      For example, if going from fullscreen to not fullscreen this hook